From c4d44eca505037601a0bab69d2032edc8d67a7bf Mon Sep 17 00:00:00 2001
From: Kevin Walter <kevin.walter.private@googlemail.com>
Date: Tue, 19 Aug 2014 01:54:41 +0200
Subject: [PATCH] Change all uses of `use foo = bar` to `use bar as foo`

---
 src/cargo/ops/cargo_generate_lockfile.rs | 4 ++--
 src/cargo/util/config.rs                 | 2 +-
 src/cargo/util/errors.rs                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs
index db0d24b2d..9bf5c1260 100644
--- a/src/cargo/ops/cargo_generate_lockfile.rs
+++ b/src/cargo/ops/cargo_generate_lockfile.rs
@@ -4,7 +4,7 @@ use std::io::File;
 
 use serialize::{Encodable, Decodable};
 use toml::Encoder;
-use toml = toml;
+use toml as toml;
 
 use core::registry::PackageRegistry;
 use core::{MultiShell, Source, Resolve, resolver, Package, SourceId};
@@ -12,7 +12,7 @@ use core::PackageId;
 use sources::{PathSource};
 use util::config::{Config};
 use util::{CargoResult, human};
-use cargo_toml = util::toml;
+use util::toml as cargo_toml;
 
 pub fn generate_lockfile(manifest_path: &Path,
                          shell: &mut MultiShell)
diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index 9878fe29e..6e03115ac 100644
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -5,7 +5,7 @@ use toml;
 use core::MultiShell;
 use util::{CargoResult, ChainError, Require, internal, human};
 
-use cargo_toml = util::toml;
+use util::toml as cargo_toml;
 
 pub struct Config<'a> {
     home_path: Path,
diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs
index 352afb356..e93b6b96b 100644
--- a/src/cargo/util/errors.rs
+++ b/src/cargo/util/errors.rs
@@ -5,7 +5,7 @@ use std::fmt::{Show, Formatter, FormatError};
 use std::str;
 
 use docopt;
-use TomlError = toml::Error;
+use toml::Error as TomlError;
 use url;
 use git2;
 
-- 
2.30.2